From: Dmitry Gutov <dgutov@yandex.ru>
Date: Sun, 29 Nov 2015 21:41:58 +0000 (+0200)
Subject: Update menu-bar-goto-uses-etags-p for the current xref API
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~1403
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=0887bdf90bed0749813632cc67a5663fbed64371;p=emacs.git

Update menu-bar-goto-uses-etags-p for the current xref API

* lisp/menu-bar.el (menu-bar-goto-uses-etags-p): Consult
xref-backend-functions, instead of now-nonexistent
xref-find-function.
---

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index defd8db6c0d..fe2b6a6681b 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -413,9 +413,8 @@
     menu))
 
 (defun menu-bar-goto-uses-etags-p ()
-  (if (boundp 'xref-find-function)
-      (eq xref-find-function 'etags-xref-find)
-    t))
+  (or (not (boundp 'xref-backend-functions))
+      (eq (car xref-backend-functions) 'etags--xref-backend)))
 
 (defvar yank-menu (cons (purecopy "Select Yank") nil))
 (fset 'yank-menu (cons 'keymap yank-menu))